Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 28 Apr 2011 22:28:58 +0000 (15:28 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 28 Apr 2011 22:28:58 +0000 (15:28 -0700)
commitd7f2f3b9abd210d6c0bea2c1d7a5170a08f3bf48
treec496b219a96c2310cd99125e0758a2fe8fce28b3
parent485a6cd64b51e7ceca532f53aa655c9889da392d
parentba0addcfbe6506d4521efa7074944c9ad31e186a
Merge from mainline.
src/ChangeLog